keyring: Actually ensure sensitivity when the keyring dialog opens

I misunderstood how the control flow for the keyring worked.

https://bugzilla.gnome.org/show_bug.cgi?id=690895

diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index ff59fa3e338c6d9674068e6dd53a4713ade8e701..34d7b6dfd718246f7fc0b8e87917dda1b73081ef 100644 (file)
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -171,12 +171,14 @@ const KeyringDialog = new Lang.Class({
     _onShowPassword: function(prompt) {
         this._buildControlTable();
         this._ensureOpen();
+        this._updateSensitivity(true);
         this._passwordEntry.grab_key_focus();
     },
 
     _onShowConfirm: function(prompt) {
         this._buildControlTable();
         this._ensureOpen();
+        this._updateSensitivity(true);
         this._continueButton.grab_key_focus();
     },
 
@@ -185,12 +187,10 @@ const KeyringDialog = new Lang.Class({
     },
 
     _onPasswordActivate: function() {
-        if (this.prompt.confirm_visible) {
-            this._updateSensitivity(true);
+        if (this.prompt.confirm_visible)
             this._confirmEntry.grab_key_focus();
-        } else {
+        else
             this._onContinueButton();
-        }
     },
 
     _onConfirmActivate: function() {